Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 18 May 2010 23:23:58 +0000 (23:23 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 18 May 2010 23:23:58 +0000 (23:23 +0000)
commit915e1dde2b86fd1432fb3d6a23cf2a39b253ae44
treefb3f65c8ca1093b050d8e102d827d95a44121435
parent1d8db10280e66ecee8383c051cab0607db1f63e8
parent9ebb87309f84579c8c52ceeddaa4277d5e6993fd
Merge from mainline.